From: Ewan Mellor Date: Thu, 14 Sep 2006 07:18:56 +0000 (+0100) Subject: Remove the '-instance' parameter from the qemu device model. Since this parameter X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15658^2~52^2~14 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=9054dbd238a18e60d788b30f8f16d43af9a053bf;p=xen.git Remove the '-instance' parameter from the qemu device model. Since this parameter is not interpreted by the DM, it actually causes the DM to hang if passed. Future device model support for the vTPM will read parameters from the xenstore and won't need the command line parameter(s). The patch includes a small change to the debugging output for the vTPM module. Signed-off-by: Stefan Berger --- diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index 941e01749f..1ee771b559 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -340,10 +340,6 @@ class HVMImageHandler(ImageHandler): (nics, mac, model)) ret.append("-net") ret.append("tap,vlan=%d,bridge=%s" % (nics, bridge)) - if name == 'vtpm': - instance = sxp.child_value(info, 'pref_instance') - ret.append("-instance") - ret.append("%s" % instance) return ret def configVNC(self, config): diff --git a/tools/python/xen/xend/server/tpmif.py b/tools/python/xen/xend/server/tpmif.py index f3315416b6..71ec6e15cb 100644 --- a/tools/python/xen/xend/server/tpmif.py +++ b/tools/python/xen/xend/server/tpmif.py @@ -52,7 +52,7 @@ class TPMifController(DevController): if inst == -1: inst = int(sxp.child_value(config, 'instance' , '0')) - log.info("The domain has a TPM with instance %d and devid %d.", + log.info("The domain has a TPM with pref. instance %d and devid %d.", inst, devid) back = { 'pref_instance' : "%i" % inst, 'resume' : "%s" % (self.vm.getResume()) }